home *** CD-ROM | disk | FTP | other *** search
/ Skunkware 98 / Skunkware 98.iso / src / net / bind-contrib.tar.gz / bind-contrib.tar / contrib / misc / settransfer-gaine.shar / ns_maint.c-DIFF < prev    next >
Encoding:
Text File  |  1996-10-25  |  3.4 KB  |  113 lines
  1. *** ns_maint.c-    Fri Dec 22 05:20:36 1995
  2. --- ns_maint.c    Fri Mar 22 14:13:55 1996
  3. ***************
  4. *** 90,95 ****
  5. --- 90,99 ----
  6.   
  7.   #define    qserial_qfull()    (qserials_running == MAXQSERIAL)
  8.   
  9. + #if defined(SETTRANSFER) && !defined(ROUND_ROBIN)
  10. + extern char * getXfer();
  11. + #endif /* SETTRANSFER && !ROUND_ROBIN */
  12. + 
  13.   #ifdef CLEANCACHE
  14.   static time_t cache_time;
  15.   #endif
  16. ***************
  17. *** 281,289 ****
  18. --- 285,322 ----
  19.       struct zoneinfo *zp;
  20.   {
  21.       struct qinfo *qp;
  22. + #if defined(SETTRANSFER) && !defined(ROUND_ROBIN)
  23. +     int mcntr; /* looping variable */
  24. + #endif /* SETTRANSFER && !ROUND_ROBIN */
  25.   
  26.       dprintf(1, (ddt, "qserial_query(%s)\n", zp->z_origin));
  27.   
  28. + #if defined(SETTRANSFER) && !defined(ROUND_ROBIN)
  29. +        /* if zp->z_xaddr or zp->z_addr has our own address in it,
  30. +     * then we may be dealing with a ``dynamic'' zone - i.e.
  31. +     * calculating this information via an external program
  32. +     * (e.g. for load balancing benefits).  The serial number
  33. +     * won't change until _after_ we call the zone transfer
  34. +     * program.
  35. +     */
  36. +     dprintf(1, (ddt, "qserial: checking myself\n"));
  37. + 
  38. +     if (zp->z_xaddr.s_addr == netloop.my_addr.s_addr) {
  39. +         dprintf(1, (ddt, "qserial_query(%s) found me.\n",zp->z_origin));
  40. +         addxfer(zp);
  41. +         return;
  42. +     }
  43. +     for (mcntr=0; mcntr < NSMAX; mcntr++) {
  44. +         dprintf(1, (ddt, "qserial_query - checking [%s]\n",
  45. +             inet_ntoa(zp->z_addr[mcntr])));
  46. +         if (zp->z_addr[mcntr].s_addr == netloop.addr) {
  47. +         dprintf(1, (ddt, "qserial_query(%s) found me.\n",zp->z_origin));
  48. +         addxfer(zp);
  49. +         return;
  50. +         }
  51. +     }
  52. + #endif /* SETTRANSFER && !ROUND_ROBIN */
  53. + 
  54.       if (qserial_qfull())
  55.           return;
  56.   
  57. ***************
  58. *** 465,471 ****
  59.   
  60.               a = zp->z_addr[cnt];
  61.               if (aIsUs(a) &&
  62. !                 !haveComplained(zp->z_origin, (char*)startxfer)) {
  63.                   syslog(LOG_NOTICE,
  64.                      "attempted to fetch zone %s from self (%s)",
  65.                          zp->z_origin, inet_ntoa(a));
  66. --- 498,510 ----
  67.   
  68.               a = zp->z_addr[cnt];
  69.               if (aIsUs(a) &&
  70. !                 !haveComplained(zp->z_origin,
  71. !                                               (char*)startxfer)
  72. ! #if defined(SETTRANSFER) && !defined(ROUND_ROBIN)
  73. !                            && (!getXfer(zp->z_origin))
  74. ! #endif /* SETTRANSFER && !ROUND_ROBIN */
  75. !                            ) {
  76. ! 
  77.                   syslog(LOG_NOTICE,
  78.                      "attempted to fetch zone %s from self (%s)",
  79.                          zp->z_origin, inet_ntoa(a));
  80. ***************
  81. *** 504,513 ****
  82.   
  83.       if (pid == 0) {
  84.           /* Child. */
  85. !         execv(_PATH_XFER, argv);
  86. !         syslog(LOG_ERR, "can't exec %s: %m", _PATH_XFER);
  87. !         _exit(XFER_FAIL);    /* Avoid duplicate buffer flushes. */
  88. !     }
  89.       /* Parent. */
  90.       xferstatus[i].xfer_pid = pid;  /* XXX - small race condition here if we
  91.                       * can't hold signals */
  92. --- 543,562 ----
  93.   
  94.       if (pid == 0) {
  95.           /* Child. */
  96. ! #if defined(SETTRANSFER) && !defined(ROUND_ROBIN)
  97. !                char * pathXfer;
  98. !                pathXfer = getXfer(zp->z_origin);
  99. !                if (pathXfer != (char *)NULL)
  100. !                  execv(pathXfer, argv);
  101. !                else
  102. !                  execv(_PATH_XFER, argv);
  103. ! #else /* SETTRANSFER && !ROUND_ROBIN */
  104. !                execv(_PATH_XFER, argv);
  105. ! #endif /* SETTRANSFER && !ROUND_ROBIN */
  106. !                 syslog(LOG_ERR, "can't exec %s: %m", _PATH_XFER);
  107. !                 _exit(XFER_FAIL);       /* avoid duplicate buffer flushes */
  108. !         }
  109. ! 
  110.       /* Parent. */
  111.       xferstatus[i].xfer_pid = pid;  /* XXX - small race condition here if we
  112.                       * can't hold signals */
  113.